Add more / clean up specs