Updating test suite; needs more work to execute them successfully