Added a few more relevant tests