Add more unit tests
Move a few var declarations outside of setUp in order not to declare them every time
Merge pull request #29 from tampakrap/unittests

Add more unit tests