Adding tests for initial and inherit values, and some additional cleanup