Bug fixes for running tests