#27 Fixed more tests