add tests, remove header class variables