Tests fixed. Things work well.