Fixes all bugs! All tests run