Refactored tests for #35