Added separate tests, moved comments