Additional unit testing