updated tests for new framework