renames fixtures to be more clear
adds missed fixtures