Re-write specs to use expect and subject
Add test assets