[GP,LA]{refactoring} remove unneeded things, add some more tests, update test harness