Adding test coverage for const/local, fixing init/naming scheme.