fixed (almost all) tests