Got up to 58% code coverage