Adding more tests, trying to get then chaining working