update to be compatible with Laravel correctly
file cleanup
fixed unit test