fixed issues, wrote tests
should actually work now
have wercker run tests