added tests and Rake stuff