Order tests and add windsor patterns