Replace extends class
Fix test for load method