Added better tests and removed the har coupling