Fixed Style, started test classes