Update tests to no longer have Is-methods
Update readme and some tests