Created first tests
added tests
Merge https://github.com/rasave01/sp2-cw2-2014