Laptop changes, nullpointer on tests
Fixed NP, Res issues