More consistent error handling

Version:   2014.1009.36
Change-Id: Ic49e64e22bc85784bf356f6741051f6f3d89eefb
More convenient test targets

Version:   2014.1009.37
Change-Id: I4663f6b84ec07a5a5fb747ac7e911c308fc05b30
Reset environment when done

Version:   2014.1009.38
Change-Id: I18c764ed466d174117d881cd486363615a6a5f00
Incremental test coverage improvement

Version:   2014.1009.39
Change-Id: I7c11e8e38004daf0007203fef647ac83c9af076d