Added basestate switch to convervation tests
Removed interpX functions in different classes