Fixed / upgraded unit tests