Moved class
Test added