Fixing compiler warnings
Adding more test structure