Added new integration tests

This might make the unit tests so far obselete as they're testing the
nuts and bolts a bit too much
Simplify

Get rid of over engineering. Made a simpler tests.
Fixed get multiple