fix warnings + moar tests