Added unit & integration test