Added bunch of tests