fix labels, additional figure generation in tests