Refactored test classes, removed timestamp messages from log to reduce size