Moved tests back