make the test implementation better