enhance toy build unit tests
fix remarks