Add more tests for Riley