Removed upcoming, fixed broken test