Fixed some minor warnings
Tests