Class test improvements