cleaned up test, implemented more stuff