Move model Tip back, remove spec and test