Updated tests, begin building features