Added extra tests, updated requirements for test running.