fix views and include tests