Did some unit testing