Restore previous test & add new one, cleanups