Adds tests and renames test files.
Renames test file.
Adds missing return statement and test case.