Make test actually a module; fixes #1 and fixes #2