Give the spec suite some much-needed TLC
Move unclear and broken tests to clear(er) and working specs