Minor updates; added tests; added test data