Further test improvements, done i think