Increased test coverage. Fixed several minor bugs.