fixing sample tests
removing util
making the logic human-readable :)
dropping the database
Merge pull request #3 from ric03uec/master

fixing sample tests