Was supposed to be included in last commit - ie. new tests