More tests, modules fixes