Added some new things to test