Re-arranged unit tests