Separate tests, fix indentaion