Update and cleanup of tests