Adding fixture loading and some more tests