Addressed PR 85 feedback on test classes