update to lab 5, fix tests, cleanup lint