Refactored tests in single files matching the source