Added a few more critical tests :)