Fix methods and test to compile