Completes tests and fixes