improvet test code