fixed load and tests