Adding more test cases; using own data types