Add frisby testing
More tests and updates