All possible tests now passing