More testing + spec stuff.