swapped out test data into single files
tests: fixes, be more verbose