Via tests, getting more functionality in place