Added tests and make