added Mike's tests