Tests fixed (tm)