MAINT/TST: moved some code around, added some new tests
TST: test addition
TST: added tests