Tests added, minor CSS changes