Added more passing tests. Should have been written before