Added tests and rebuild project