All of Philipp's tests now pass :)