added more testing functionality