updated test code:
- faster tests
- removed bullshit