Add tests; fix bug with content vs thumbnail