Clean up testing and add new basic test