More testing, expansions etc