Added build scripts
Updated unit tests for NULL changes