Fixed tests to work with 05bef62