Added some fixtures, still to be integrated into tests