Added tests. Bug fixed for hours between lunch time