Enhanced test

Pulling changes, to work on new features.