Clean up specs
Add fill test