Moved tests, etc so they are appropriate.