Small fixes for test cases (#19)