Refactor class names, initial loading file tests