first test improvements