Moved and cleaned up test