Refactor test cause i'm a picky bitch ;)