Additional FORGE-1247 - Fix build system ordering. Fix tests.