Added tests and updating ui