Moved tests back to the app module

Need to figure out how to contain tests in a seperate module