Restructured tests so they run properly
Moved phpunit configuration to the top level and updated bootstrap
accordingly
Updated code and tests for isExpired function