Tried to make code coverage more useful by trying to reduce the numer of
inline if-statements and case statements