Update test framework, fix -w opt

 * -w was not being handled by getopt

 * Update test framework with more step definitions, a Makefile
   and a README describing the available step definitions.