added another unit test, more cleanup