More tests and bug fixes; added FAFCodeScanner