Updated with most important tests