added test annotation and fixes
cleanup and good test data