Fixed schema
Added schema test
Updated comments