Squashes migrations together

No need for multiple migrations for such simple tables
Removes unneeded pending tests