Simplify test
Update test specs
Re-document