Nearly everything is working, except one tests, needs to be fixed