added some more tests, somebody rake test?