Removed code that requires a Test Class