Updated tests to work with #268