Get tests working again, improve loader for faster, higher-quality loads and makes future development easier.