first test
added tests
Merge branch 'AdAndSearch' of github.com:ese-unibe-ch/ese2014-team8 into AdAndSearch