Year assert and moved attribute specs together

Combined the assertions in one spec to speed up tests. Will separate
later when not running suite over and over again.