Refactor & data fixture & auth