removed rake
added generic tests