renaming main app
adding some tests retroactively