[IMP] Tests are shorter + all constants are now final