Moved tests to a proper test project
Fixed recursion bug (for now)