Moved tests where it belongs to