Minor bugfix
Made the tests more extensive