Implement some new unit tests for ecpt