Convert specs to beaker and increase coverage