Test clean-up and bug fixes