Moved changed test cases to correct functions; edited test case