Fixed tests now that methods are split between class and instance