Moved the prepared stuff to test