Improves tests and errors report