Fixin' stuffs and testing other stuffs