minor fixes, adds test data