Added a few extra spec / tests