Fixed eclipse settings problem
some edits from code review
Made changes based on feedback from the code review
fixed tests alignment