Updated tests and added loader debugging