Fixed build system and test bug...
2 files changed