Added a lot of tests, :cat: