Refactor unit tests syntax with proper beforeEach
Reformat code
Correct typos around
Little typo here =)
Few refactors around code