Started expanding tests