added some tests and updated controllers