Fixed header to not be included more than once(?)
Changed the second IS_DIR_P to IS_FILE_P.. Whoops
Added return clause for the macros.
Added stuff for testing.