Moved tests into /features