add fixtures, arranged tests