Move tests inside a single method
Remove unused code
Merge pull request #83 from cs-shadow/cleanup-tests

Move tests inside a single method and remove unused code