added status support for skip flag
cleanup
major rewrite of tests