rename reader class
add test