added more to the test and code set..