Did some code re-working to increase code coverage