Added Test, fixed class name