Fixed spec and put some mess above other mess