default values changed to work with test data