removed classes from App as already exists in base
moved stub for tests to its own part and added code to generate
moved public static consts toward top of class definition