Added testers and more methods to the models/controllers