Added tests. Still have to implement some of them