Fix [#13] - A lot of errors and warnings in tests