rearrange req
add tests for homepage