Added more tests. This appends to #6.