moved Test according to models