#SB-220: Separate the test and resource-only modules

Final polishing.