Added some test data
Minor fixes for consistency