Tests: Cleanup module test, removing duplicated non-atomic tests

Extended other tests to keep the same test coverage.

Fixes #477