Tests + refactoring

[hypnoglow]

#6

[coveralls]

Coverage increased (+4.2%) to 50.233% when pulling 1703c44 on tests into 9e58ca0 on master.

[coveralls]

Coverage increased (+0.2%) to 46.285% when pulling 3e6d8ac on tests into 9e58ca0 on master.

[coveralls]

Coverage increased (+1.9%) to 47.988% when pulling c3df95e on tests into 9e58ca0 on master.

[coveralls]

Coverage increased (+2.06%) to 48.115% when pulling 0ccffd1 on tests into 9e58ca0 on master.

[coveralls]

Coverage increased (+1.8%) to 47.853% when pulling 2b63138 on tests into 9e58ca0 on master.

[coveralls]

Coverage increased (+5.6%) to 51.687% when pulling 228355e on tests into 9e58ca0 on master.

[coveralls]

Coverage increased (+6.8%) to 52.879% when pulling 891c278 on tests into 9e58ca0 on master.

[coveralls]

Coverage increased (+5.5%) to 51.58% when pulling 592f400 on tests into 9e58ca0 on master.

[coveralls]

Coverage increased (+4.8%) to 50.862% when pulling 69af970 on tests into 9e58ca0 on master.

[coveralls]

Coverage increased (+9.7%) to 55.761% when pulling 6f787c2 on tests into 9e58ca0 on master.