Fixed all tests, increased coverage to 86.5%.