Move test to class methods