Adding test cases to aai-core to increase coverage