Classes are now more test friendly