removed comma and changed order of some functions
Added test