Cleaned up testifj.org branch