cleaning up classes and adding first tests