OSNG-10 some builder and tests