Tests: moved them to proped place.