Added test app, constructors and some missing fields