Standard operations tests + fixes
Tests