Merged tests into single file, accordingly to new module structure