Fixed singleton getInstance
Added JUnit asserts and fail snippets