#27 Fixed exceptions in some tests