Updated test targets to reflect spec changes