Updating basic test and interface.

Some things just needed modification after last update.