Added tests and default controller provider