Added tests and updated README