chore(tests): Finished some more tests and base functionality