Moved tests to subdirectories.
Added missing include