Added more tests, refactored code to reduce method length.

Added more tests, refactored code to reduce method length. #153