removed Test from main class
refactor, comments removed