Fixed results display + other tests