Cleaned up tests, adjusted return values for consistency, added TODOs