update tests for new design
Merge pull request #307 from jroo/update_tests

update tests for new design