Separated tests into groups and added type tests