Updated test, needs updates