modifications to tests and code after fixing bugs from smoketest