Add test code
Fix for warnnings