split tests and make them work