updated tests to reflect refactoring
prepping for 0.2.1-1