Did some test changes in theory and loader