Updated SConstruct & fixed breaking unit tests.