Add most tests