Adding some tests
Fixing dependencies of application