Added new test and the needed stuff to accomplish it.