Develop: test improvements