updated sample/test data fixtures and merged them all into one file. updated tests to work with recent commits