Add more user tests, add Comment contract, begin FileRoute