Main tests passing