make template

Just for now comment out unit tests, till all containers ported.