1. Fixed a couple compiler warnings
1. Reincluded
2. Fixed a couple of compiler warnings in test project