Bug fixes, build, compilation
 test file