Move last tests over