Updated tests, clean-up