removed assertions, added a few custom-functuions, a few tests for these functions, and a few other tests