Added feature tests, everything green