Minor - improving test capabilities