Bumped code coverage up to 92%