Added test class, fixed fields