Added terms and bindings + unit tests.
Removed dummy class and test