Few test improvements