Refactored tests into single file.