#523 Improvements in testing page