some cleaning up and improving the test. still figuring thing out ...