clean up, added Student tests