removed App class
Added test