Adding test app
Various fixes