Added tests and set up