Added fixture test & updated some tests stuff