Resolving some issues with build
Resolved unit test issue