Friendly test environment setup complete

1. Add features to test environment for easy testing