Move class tests under class