Moved Tests into BaseApp/test