Fixed unit tests

Commented out a test. Rest have been solved.