Moved class and tests over