Adding more tests. and making them work.