Minor changes. Camel-Case and also refined tests so that the order should not matter only that the value is checked.