More unit & integration tests