404 file, cleanup, WIP on tests