Finish my tests tests + fix some little bugs