Added test
Some manual integration testing