Modified modules to work correctly.

Let's see if the tests pass now. Otherwise, something is wrong with my
Travis configuration file...