1st LT battle fixes and more tests