Added basic classes and tests