Building next test and moving things around.