fix convenience methods and add more tests