Fixed tests to reflect beta6 api changes