- fixed  and cleaned up tests
 * fixed various issues with tests
 * added more test data (expecteds)