Moved tests to being part of main app so others can use it