added basic expression blocks
added test for def