Written more tests