Many fixes for test features