Added some more integration unit tests