Added tests and marking as done