Add more tests #631