Updated tests and module loading infrastructure