Added tests and objectives