[CLEANUP] - Fixing build and test run