Fixed tests to work with current master