Fix test module reference
Clean up tests