Refactoring tests.
Removing unused return value.
Splitting up large tests.