Settings and getters for lot
Cleaning up lot
Unit test fix