Minor changes, updated tests

Commented out deprecated files