bug fixes; test fixes
updated files