Fixed final test cases; ready for review