Adding tests and making them pass