Test::More moved to test_requires; add rlib on test_requires
Regularize more indentation