Fixed includes from within folders. Removed lib test.