more tests, and cleanup due to rspec-system changes

Signed-off-by: Ken Barber <ken@bob.sh>