Finally revised the test classes to provide a way to support all the models in an organized fashion.
New 'Model' class contains tests specific to each model. currently only 1509-type models supported, but is a simple matter to expand