Moved test coverage up to 60%