fixes to get tests,README examples to work