Cleaned up tests
Function spacing