added nominal test and lots of setup improvements