Added first feature tests