day test reafactored
day and base test reafactored