make tests, make them work