layer registered, tests extended, cleanup