naming tests and adding final classes