Re-enabled unit testing