Updating some tables

* To fit collection formatting
* Also refactor some tests for constants