Trying to fix bugs to test, but having no luck