updates, Tests now work