sync expects support
fix various expects issues
tests for expects
cleanup - all tabs are spaces