Updated Interpreter Unit Tests

Updated Layout of Interpreter Unit Tests and merged in Joe's changes.