Added tests, worked on registration