Implemented these two unit tests, and fixed an issue with draining with a limit